Android mainline 11.0.0 release 4
Snap for 6450912 from 75b818f3e48038eca1e083d1afce5f4dcb8e6534 to mainline-release

Change-Id: If712981a69c4be59a00a9b99fe3622671d40abf3