Android platform 11.0.0 release 33
Merge cherrypicks of ['googleplex-android-review.googlesource.com/23185329'] into rvc-platform-release.

Change-Id: I09c523a7413e671193db8da8a2d4ebda9b7e9611