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

Change-Id: Ice530a69d79bde479dc093daa15aadac243aa067