Android 11.0.0 release 17
Merge cherrypicks of [12196470, 12196437] into rvc-release

Change-Id: Id3eaf393b9aa384a9de4a326634848d359d5f93f