commit be4a8af53eba64c318023418bf6746cb38eab370
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Aug 01 19:35:14 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 01 19:35:14 2023 +0000
tree 2311ae92fe2905adf41d3f170a3584e068cba92c
parent c7d56296ab24e7925d2727456f808b2c7e4e398c
parent f5b2fe8504dc4648ec8a75c5065387cbf973a402

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

* changes:
  [automerger skipped] Merge "Add userId check before loading icon in Device Controls" into sc-v2-dev am: fee30bd247 -s ours am: 16f950f41f -s ours am: 31c96f00e1 -s ours am: 7bf8adb31e -s ours am: 956623c6c0 -s ours
  [automerger skipped] Add userId check before loading icon in Device Controls am: 2be24a7804 -s ours am: c1b0b217a9 -s ours am: 6618831d0d -s ours am: 99bdfb081f -s ours am: e988d34132 -s ours