tree 46f380eb2ae6c981add1ac073c9875dacbb23139
parent f96bc124b42f45677900dc1777db0d7805baaea3
parent 110710cfbc382cdbd003780caec188ea9cb22963
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1688399603 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1688399603 +0000

Snap for 10428683 from 110710cfbc382cdbd003780caec188ea9cb22963 to mainline-adbd-release

Change-Id: Ie632b934fad90cbadf9153f7d3ccde601585bc0b