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

Change-Id: Ic0b91da852c26283117e0267589a716e9f102322