Android platform 11.0.0 release 16
Merge cherrypicks of [16230693, 16406360] into rvc-platform-release.

Change-Id: I74aa465ee2e3b2ba2f7a8230e1996e5b9b15255a