[automerger skipped] Merge Android U (ab/10368041) am: 85353e485f -s ours

am skip reason: Merged-In Idfea598bc45bb12c875b66d102cf14bcdeca5812 with SHA-1 7da5b0fc40 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/firebase-messaging/+/24182060

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