Android mainline 11.0.0 release 3
Snap for 6650380 from d74e5d58613f9248172aab3403235e0409ec3ab3 to mainline-release

Change-Id: I639e36e85879044407e16c2acd36ed08b6a991fa