[automerger skipped] [DO NOT MERGE] Wait for preloading images to complete before inflating notifications am: b9cd15ad8a -s ours am: 0e635c3365 -s ours

am skip reason: subject contains skip directive

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

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