Android mainline 11.0.0 release 3
Snap for 6838321 from c86c667ff32290d3aa7fb21a2a2dd0755b84db50 to mainline-release

Change-Id: I693c319a0803f8db8aaea4bc7f1fa9b6908b5625