Android mainline 11.0.0 release 3
Snap for 6554163 from fb30ac4fd54225f91107a685d32a35e01d17eb9e to mainline-release

Change-Id: I9120c733b3cc54fb0705b7e0af0956bfd1bddf65