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

Change-Id: I07cb0c00a82bd361abdc4d3038556ea974e2e2fc