Android Mainline 11.0.0 Release 6 (7124067)
Snap for 6838321 from b0122f7d6a05335108e6df17f83ac4a3a9acd739 to mainline-release

Change-Id: Icfb353840e009ff825527af48094096a7cb9344e