[automerger skipped] Add userId check before loading icon in Device Controls am: 570aad7c61 -s ours am: 9e3932c8f6 -s ours

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

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

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