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

Change-Id: Ia233982452c0be06ac3741c30777da0e639efaa0