Merge "Add userId check before loading icon in Device Controls" into udc-dev am: d0f6b9ac

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



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