Merge "Add userId check before loading icon in Device Controls" into udc-dev am: d0f6b9acee am: 0316f4fb7b am: fa86a66183 am: 3d925fae71

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

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