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

Change-Id: I4ecaf91ea11950df48358f892b9f4d4570ed7461