[automerger skipped] Add userId check before loading icon in Device Controls...

[automerger skipped] Add userId check before loading icon in Device Controls am: 2be24a78 -s ours am: c1b0b217 -s ours am: 78f6c79a -s ours am: 029e25a3 -s ours am: 79421b76 -s ours

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

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



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