Android mainline 11.0.0 release 4
Snap for 6465939 from 3ca049371b56783d16b09b2aeca2e38c4684c79a to mainline-release

Change-Id: I4649a9fbc9a15e1ab38bf1912c1569d562156807