[automerger skipped] Workaround a notification inflation race condition. am: 99bbb21e -s ours

am skip reason: Merged-In Ic13890a4a97628920f5e70d0f0cc24cc00b4829c with SHA-1 d5428a51 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19300932



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