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

[automerger skipped] Merge "Add userId check before loading icon in Device Controls" into sc-v2-dev am: fee30bd2 -s ours am: 16f950f4 -s ours am: 6394c426 -s ours am: 72b88be5 -s ours am: 1e2468f4 -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: Id93be8c9fb3027497b27db571c5661feab4669f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>