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

Change-Id: I45576983eafb88314300a1cee5935c17faa84399