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

Change-Id: I1048f60118a277ce83d2b705dcbf858fdd064603