Android 11.0.0 release 3
Merge cherrypicks of [12265987, 12265921] into rvc-release

Change-Id: Ieeedf8fa54ece8e2350733732a399802f1cc7c93