Android Platform 11.0.0 Release 6 (RPM1.210413.002)
Merge cherrypicks of [14255166] into rvc-platform-release

Change-Id: I7c1583eee6c4f26baf52e47c8046020b97ceafea