[automerger skipped] Merge "[DO NOT MERGE] Wait for preloading images to complete before inflating notifications" into tm-dev am: 54439081 am: b751a6e0 am: 36ba0fe1 am: d935ef61 -s ours

am skip reason: subject contains skip directive

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



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