Android mainline 11.0.0 release 4
Snap for 6583806 from de643c943e396fbb346d51bcd6acac5ba9b59634 to mainline-release

Change-Id: I01ac908cfcebe713f6adc824387460d68e9744c1