[automerger skipped] [DO NOT MERGE] Wait for preloading images to complete before inflating notifications am: 733089e71c am: 80c5f50d2c -s ours am: cb98f26026 -s ours am: f02f563376 -s ours am: 63b051e1a9 -s ours

am skip reason: subject contains skip directive

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

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