Android mainline 11.0.0 release 15
Snap for 7080740 from a6dd58522b54e7cf493c968d04a29a72820038f4 to mainline-extservices-release

Change-Id: Ib6c7101da32a5fa422eba29ea76ae8c8386c1e2c