device FCM -= android.* am: 6d975603e5 am: 1b4931df3f

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/24249169

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