[conflict] Merge "Add userId check before loading icon in Device Controls"...

[conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c

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



Merged-In: I39b7bc62d82e20b5ba8747be13a2aa7bf21a59a2
Merged-In: I60896a6f53307f0e97a9223b599a2891c6c0c08d
Merged-In: Ib0e677f7ccbed6299ea07939519c7dcf6d371bec
Merged-In: Ibe4fb69a90904787b9f97a7cd90d318a047d1e11
Merged-In: Iba846f19098c71c0519470cd7b8c1fd60d47e70b
Change-Id: I4666499fa8e2c51a7900913c9e22127cb6a4283a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>