[automerger skipped] Merge "Add userId check before loading icon in Device...

[automerger skipped] Merge "Add userId check before loading icon in Device Controls" into sc-v2-dev am: fee30bd2 -s ours am: 16f950f4 -s ours am: 31c96f00 -s ours

am skip reason: Merged-In Ib0e677f7ccbed6299ea07939519c7dcf6d371bec with SHA-1 22f97f08 is already in history

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



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