Android mainline 11.0.0 release 3
Snap for 6679400 from 02fa24c5bfae3e6ec9684b5e0e5cb6847b21f3f8 to mainline-release

Change-Id: Ida4b466bf179171e7f52cf022fedaafcbecf252a