Android platform 11.0.0 release 24
Merge cherrypicks of [16549694, 16549695] into rvc-platform-release.

Change-Id: I2cced1553ab17c18b8400b9da6c115a35b62a42d