[automerger skipped] Add userId check before loading icon in Device Controls am: 2be24a7804 -s ours am: c1b0b217a9 -s ours am: 6618831d0d -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: Ie0924215329930bbbdb7fd9e5ea0c27918e4b290
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>