[automerger skipped] Merge "[DO NOT MERGE] Wait for preloading images to complete before inflating notifications" into sc-v2-dev am: 59e3358a -s ours am: 061b39a5 -s ours am: ca2c8c0e -s ours am: 1acd85d4 -s ours am: 24292d44 -s ours

am skip reason: subject contains skip directive

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



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