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

Change-Id: Ideae116fefe5cdb9d262c4c3436a275f821ca61c