[automerger skipped] Merge "[DO NOT MERGE] Wait for preloading images to...

[automerger skipped] Merge "[DO NOT MERGE] Wait for preloading images to complete before inflating notifications" into sc-dev am: 1e43a7a2 -s ours

am skip reason: Merged-In I341db60223214cf2282b5c0270e343e1ce95fa01 with SHA-1 733089e7 is already in history

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



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