Android Platform 11.0.0 Release 23 (8964965)
Merge cherrypicks of [19418348] into rvc-platform-release.

Change-Id: Iab29c714d9d51927afd5e7123a9b2f08988040b8