Android mainline 11.0.0 release 4
Snap for 6618402 from 1264922c3c0ec155878e1cc484370dbf8f91d2e3 to mainline-release

Change-Id: I0abec647b57e7c30f5d3c5e5d1acef18a67ab84b