Merge cherrypicks of ['googleplex-android-review.googlesource.com/34108970', 'googleplex-android-review.googlesource.com/34108971', 'googleplex-android-review.googlesource.com/34107555'] into security-aosp-tm-release.

Change-Id: I9cd0fd1ab98843e9cc1802d3ec1a1e3d277c36d0