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

Change-Id: Ib86355970961d8d1edf7c3d02b95a5cfa1948f50