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

* changes:
  [automerger skipped] Merge "[conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c" into rvc-qpr-dev am: 4b74ba44 -s ours am: d892ae17 -s ours am: f715c988 -s ours am: 2c60a72d -s ours am: f0ad1262 -s ours am: 4e330903 -s ours am: 0425b69c -s ours am: bd402e32 -s ours
  [automerger skipped] [conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c am: 373c5ac4 -s ours am: 020addb6 -s ours am: d2983b8a -s ours am: a917310e -s ours am: 412ad586 -s ours am: c06cecce -s ours am: 699fac4a -s ours am: d9a00df7 -s ours