tree 352ff8cd1ebf772979f5a9bd19154931cd19bd60
parent fc4530d666f05f9ce76e9530d409f608f2c9c96d
parent 42fd03e73ec5a719a37f584a256d846face96010
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1691040206 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1691040206 +0000

[automerger skipped] Merge "[conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c93" into rvc-qpr-dev am: 4b74ba4435 -s ours am: d892ae179e -s ours am: f715c988a2 -s ours am: 2c60a72dce -s ours am: f0ad126270 -s ours am: 501cddc99b -s ours am: 42fd03e73e -s ours

am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e021f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454

Change-Id: I7451095612aa451e7090ed42476eec77f662f9b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>