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

Change-Id: If80ebb50e97cf51df18364debf997b9f585d9f45