Android Mainline 11.0.0 Release 6 (7124067)
Merge cherrypicks of [13217948, 13218047] into mainline-release

Change-Id: Ib7e46df423d47260d9608fcd03eb95d84e79fdcf