[automerger skipped] Merge "Add userId check before loading icon in Device Controls" into sc-dev am: 38e2c00694 am: f049b2096f -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: I21769ac39fc836d84aa24b3d452271d08035b9b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>