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

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

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