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

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

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