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

Change-Id: If52c455c89ec4e7906e09689301e50e33afeb8ef