Merge "Prevent app icons blinking after a user switch." into udc-dev am: bf7d5d06

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



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