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

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



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