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

Change-Id: I744c9d9f5bb423c29677fbed5adb354589c49741