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

Change-Id: If18ae90f111df8e222d21488e448da42c0cf6c85