[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 udc-dev am: 9f4c30c2 am: ecbfca29 -s ours

am skip reason: subject contains skip directive

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



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