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

Change-Id: I2b9b01a2ad5d784478d6f6e86a4eb926099c831b