Android mainline 11.0.0 release 4
Snap for 6916203 from 4a350ee52b516954a08a8f39ec39b0e9346f2a4c to mainline-release

Change-Id: I81a315530714af4973034c94b9b4eb68d6fc2321