[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: ca003fa3 -s ours am: 4095fbee -s ours

am skip reason: subject contains skip directive

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



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