Android mainline 11.0.0 release 3
Snap for 6916203 from 8e7e0faa920ce620d4e054e189b1f2f434911439 to mainline-release

Change-Id: Ieda58f598083b5f0ffacf5ec5c2a034b32826742