Merge "Workaround a notification inflation race condition." into tm-qpr-dev...

Merge "Workaround a notification inflation race condition." into tm-qpr-dev am: 864d7277 am: 1565e111

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



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