Android mainline 12.0.0 release 85
Snap for 7478028 from 9f291a4ce0bee3c1db145996a5dae1ff4a247acf to mainline-adbd-release

Change-Id: I3dac48a4e85c1a5c7412dea78902295428613f8e