Merge "Add userId check before loading icon in Device Controls" into sc-dev am: 38e2c006

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



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