[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: a0dd43e3 -s ours

am skip reason: subject contains skip directive

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



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