Merge changes from topic "am-98d2611d93db4ee1a8bd296e4f2dd9ac" 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: 6394c426 -s ours am: 72b88be5 -s ours am: 1e2468f4 -s ours am: 178a9581 -s ours
  [automerger skipped] Add userId check before loading icon in Device Controls am: 2be24a78 -s ours am: c1b0b217 -s ours am: 78f6c79a -s ours am: 029e25a3 -s ours am: 79421b76 -s ours am: f1893202 -s ours