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

[automerger skipped] [conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c am: 373c5ac4 -s ours

am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e02 is already in history

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



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