[automerger skipped] Merge "Workaround a notification inflation race...

[automerger skipped] Merge "Workaround a notification inflation race condition." into tm-d1-dev am: 8eb62acf am: d62d8f6f -s ours am: e2bd44c1 -s ours

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

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



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