Android mainline 11.0.0 release 3
Snap for 6647781 from eb1cf3a46b56d794e5d9bb77b9873961d1faa540 to mainline-release

Change-Id: I21f1bc39c69339fa3cd06d0809c7433cec191f5e