Android mainline 11.0.0 release 3
Snap for 6838321 from d71c4135a93c60cca08e34e5fbfa3e0c5cf1ee8c to mainline-release

Change-Id: I3fb827e19c9e4a5a3a1f45a0525dd01eabbd1e30