Merge "Merge "Add userId check before loading icon in Device Controls" into...

Merge "Merge "Add userId check before loading icon in Device Controls" into udc-dev am: d0f6b9ac am: 27ca2217 am: 0b02edde" into udc-qpr-dev-plus-aosp am: 99a3db0f

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



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