[automerger skipped] Merge "Add userId check before loading icon in Device Controls" into tm-qpr-dev am: 4ee9dc1682 -s ours am: bc5800df32 -s ours am: 56f8490e13 -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/+/24212143

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