[automerger skipped] Workaround a notification inflation race condition. am:...

[automerger skipped] Workaround a notification inflation race condition. am: 99bbb21e -s ours am: 450d5c4a -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: I967db84cf8be2a885a3ab7deaccc3c60ab04e6f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>