Merge changes from topic "am-883be6b5e9e94d0995e6b3e7d430600a" into udc-d1-dev-plus-aosp

* changes:
  [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: 7bf8adb3 -s ours am: 216cc90d -s ours
  [automerger skipped] Add userId check before loading icon in Device Controls am: 2be24a78 -s ours am: c1b0b217 -s ours am: 6618831d -s ours am: 99bdfb08 -s ours am: 3965b85e -s ours