Merge changes from topic "am-678891196060408c82afe603de1ef284" into udc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Add userId check before loading icon in Device Controls" into tm-qpr-dev am: 4ee9dc16 -s ours am: bc5800df -s ours am: 2ac7d5c7 -s ours am: 3da43204 -s ours
  [automerger skipped] Add userId check before loading icon in Device Controls am: 570aad7c -s ours am: 9e3932c8 -s ours am: da3dd126 -s ours am: 1fa97f4b -s ours