Merge "Issue ID 382540632 but re-starting the process from the correct branch https://android.googlesource.com/device/sample/+/main/etc/apns-full-conf.xml" into main