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

Change-Id: I81222f83c7c6ed04569064550f39ca92cb30dccc