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

[automerger skipped] Merge "[conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c" into rvc-qpr-dev am: 4b74ba44 -s ours am: d892ae17 -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: I22bf5e8f7e2d28e4b8bf48fdfeaedaf7b585cf2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>