Android mainline 11.0.0 release 3
Snap for 6916203 from ba50a435e49eb12c820d8d2306f71551247a12a4 to mainline-release

Change-Id: Iaaad94a31f8d3038b499c279c403d3f578d1fdc5