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

am skip reason: Merged-In I39b7bc62d82e20b5ba8747be13a2aa7bf21a59a2 with SHA-1 0c32739fab is already in history

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

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