Android 11.0.0 release 34
Merge cherrypicks of [13636770, 13638692, 13636771, 13637567] into rvc-qpr2-release

Change-Id: Ib0441a0d97f820a25dce9145bf4636fdea163146