Android mainline 12.0.0 release 85
Snap for 7478028 from 3bdacba2f681d2f004d14fd4813942902a59d38e to mainline-adbd-release

Change-Id: I01dab85bbebf2ccfa30fefeda04bce35d6af260c