[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-dev am: 38e2c006 am: f049b209 -s ours am: 306f04b9 -s ours am: 5e764ff3 -s ours am: f6a0311d -s ours am: 3aa758ce -s ours

am skip reason: Merged-In Ibe4fb69a90904787b9f97a7cd90d318a047d1e11 with SHA-1 2be24a78 is already in history

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



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