Merge cherrypicks of ['googleplex-android-review.googlesource.com/34858977', 'googleplex-android-review.googlesource.com/35601805', 'googleplex-android-review.googlesource.com/35601644'] into security-aosp-tm-release. Change-Id: I6bcc036fd39276c59b0ef7406ad9972b21b11231