[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-v2-dev am: 59e3358a -s ours am: 061b39a5 -s ours am: 9e29ee83 -s ours am: cc745552 -s ours am: 5182047d -s ours am: e9654589 -s ours

am skip reason: subject contains skip directive

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



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