Android mainline 12.0.0 release 87
Snap for 7478067 from b858c6925d9c3d8100baaa2295479f3ab083c8ba to mainline-extservices-release

Change-Id: I5181e3227724507be700500552e63d23f2cc319e