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

Change-Id: I517aa34c569a44d5b65d611b580e6176a7108d7c