Android Platform 11.0.0 Release 6 (RPM1.210413.002)
Snap for 6787936 from 9db7fd05a974a9ec4894a9d435d7f7f15cb4aacd to rvc-platform-release

Change-Id: I2ca603247f27b92fc6b14cd523f3214a333c622d