[automerger skipped] Merge "Workaround a notification inflation race condition." into tm-d1-dev am: 8eb62acf88 -s ours am: 9ce3ca7958 -s ours
am skip reason: Merged-In Ic13890a4a97628920f5e70d0f0cc24cc00b4829c with SHA-1 d5428a51c0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19300932
Change-Id: Ic741e321f55ecc38c6299c6bb41b0e711eb4f0fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: