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

Change-Id: Ic5b3cd1a6b6860c91a7ed36c1d27281b0ec503e1