[automerger skipped] [DO NOT MERGE] Wait for preloading images to complete before inflating notifications am: b9cd15ad -s ours am: 0e635c33 -s ours am: 81ca346e -s ours am: 7665e91a -s ours am: 18063257 -s ours am: 61df4ac9 -s ours am: 76d13ff5 -s ours

am skip reason: subject contains skip directive

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



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