Merge changes from topic "fcm_8" into udc-d1-dev am: 1a512591be

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/23122684

Change-Id: Ibea4d1050a22c14675ba0a9ad1922530976a70d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>