Merge "[DO NOT MERGE] Wait for preloading images to complete before inflating...

Merge "[DO NOT MERGE] Wait for preloading images to complete before inflating notifications" into tm-dev am: 54439081 am: b751a6e0

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



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