Merge cherrypicks of ['googleplex-android-review.googlesource.com/29552323'] into security-aosp-sc-release. Change-Id: Ia61e6b09154f9cdddd62b2ae72779074da4a444d