[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 tm-qpr-dev am: 832ea378 am: c2dbbbce -s ours am: 1bea9eb4 -s ours am: 613e3ad8 -s ours

am skip reason: subject contains skip directive

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



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