Merge changes from topic "am-1b01ea6f373349eba26ea770c30ff152" into udc-qpr-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: 501cddc9 -s ours am: 42fd03e7 -s ours am: 7499a939 -s ours am: 475ef3e2 -s ours am: ed8557f2 -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: 06b24f00 -s ours am: 43a466ec -s ours am: fc4530d6 -s ours am: 7ffebb22 -s ours am: d2708119 -s ours