[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: 902f48fc -s ours am: 0e64b526 -s ours am: 83576b6a -s ours am: 59d09149 -s ours

am skip reason: subject contains skip directive

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



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