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

Change-Id: Ifd3c1e16c1d61030a34aa1124f7b01319e7fbd58