Android mainline 11.0.0 release 2
Snap for 6660892 from 33458f78e273761de2787a7d7d3d5eb1c44b0163 to mainline-release

Change-Id: I01af11bf55b3c1038b554397c549067e1d2b6321