Android 11.0.0 release 16
Merge cherrypicks of [12724202, 12724210, 12721230, 12724629] into rvc-d1-b-release

Change-Id: I9139a74259a06bbb6b06218d889d435957dc10b8