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

[automerger skipped] Merge "Add userId check before loading icon in Device Controls" into tm-qpr-dev am: 4ee9dc16 -s ours am: bc5800df -s ours am: 2ac7d5c7 -s ours am: 3da43204 -s ours am: a9bc929a -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/+/24212143



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