Merge cherrypicks of ['googleplex-android-review.googlesource.com/35164127', 'googleplex-android-review.googlesource.com/35804682', 'googleplex-android-review.googlesource.com/36007431'] into security-aosp-tm-release.

Change-Id: I54dc7fd3197a9bec791bbd32985e8d11a3239cad