Android platform 11.0.0 release 24
Merge cherrypicks of [19322655, 19868399] into rvc-platform-release.

Change-Id: If0d1abbfdc39b70dfa4c2d0a5d838ac8d9fccb60