Android mainline 11.0.0 release 3
Snap for 6694168 from 6581c2ac1b3d66cf7597e754074f4e1c8f638aca to mainline-release

Change-Id: Ief19b608226568fe0603c6b022078d233cba2f68