[automerger skipped] Add userId check before loading icon in Device Controls am: 2be24a7804 -s ours am: c1b0b217a9 -s ours am: 78f6c79a1b -s ours am: 029e25a34b -s ours am: 79421b7608 -s ours am: 86b6b9b8ce -s ours am: 14603cf4a3 -s ours

am skip reason: Merged-In Ib0e677f7ccbed6299ea07939519c7dcf6d371bec with SHA-1 22f97f081c is already in history

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

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