[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-dev am: cdd1be46 am: 0b3edb19 -s ours am: a6b7bb6a -s ours am: 7b492dd0 -s ours am: 945b8c01 -s ours am: 6ee9aea0 -s ours

am skip reason: Merged-In I60896a6f53307f0e97a9223b599a2891c6c0c08d with SHA-1 570aad7c is already in history

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



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