[automerger skipped] Merge "Add userId check before loading icon in Device Controls" into tm-dev am: cdd1be4645 am: 0b3edb1946 -s ours

am skip reason: Merged-In I60896a6f53307f0e97a9223b599a2891c6c0c08d with SHA-1 570aad7c61 is already in history

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

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