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

Change-Id: I3c866ef1f338cc9b4972dadc49c71162b4a96dad