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 sc-dev am: 38e2c006 am: f049b209 -s ours am: 306f04b9 -s ours am: 5e764ff3 -s ours am: f6a0311d -s ours am: 3aa758ce -s ours am: 72c2203b -s ours" into udc-d1-dev-plus-aosp am: 7a32394a -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/+/23982204



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