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

Change-Id: Iae6de741f974d3a401f1f463e6b657abc422a373