[automerger skipped] Merge "Add userId check before loading icon in Device Controls" into sc-dev am: 38e2c00694 am: f049b2096f -s ours am: 306f04b9c6 -s ours am: 5e764ff33d -s ours am: 8eb9a03813 -s ours am: 3d10caad63 -s ours

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

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

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