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 am: 7e82f4d4f7

Original change: https://android-review.googlesource.com/c/device/sample/+/3399310

Change-Id: Ied3fb701155b2dcacfa8f1a06a280e8f8aac6e18
Signed-off-by: Automerger Merge Worker <[email protected]>