device FCM -= android.* am: f2a2675372 am: 2443a6a6b3

Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2654090

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