Merge "[automerger skipped] Merge "Add userId check before loading icon in...

Merge "[automerger skipped] Merge "Add userId check before loading icon in Device Controls" into tm-dev am: cdd1be46 am: c8884c55 -s ours am: 91262ffd -s ours am: ce126ccd -s ours" into udc-d1-dev-plus-aosp am: 72738f6f -s ours

am skip reason: Merged-In I39b7bc62d82e20b5ba8747be13a2aa7bf21a59a2 with SHA-1 0c32739f is already in history

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



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