Android Mainline 12.0.0 Release 21 (7967248,com.google.android.adbd)
Snap for 7478028 from 8cfb92904b40ff98c82dd5309698999a28c91388 to mainline-adbd-release

Change-Id: I984447dcf22c3fb0783e801b0e0649c66969cb13