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

Change-Id: Iab11b6e26c08601b02589199a2bf14f5fc5c29fb