Android mainline 12.0.0 release 85
Snap for 7929046 from 045ed89582649ce2f1df055266651c6ee44a7abd to mainline-adbd-release

Change-Id: Ice75f559cfff2fb882bab52fed9e00df40440916