Merge "Workaround a notification inflation race condition." into tm-d1-dev am: 8eb62acf

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



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