Android mainline 11.0.0 release 4
Snap for 6539570 from 5cfdcf077be7b3727160275e83ae6b754f01dd07 to mainline-release

Change-Id: Ia4121108e10749102433a7f8627ba4d4e10d4f17