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

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



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