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

Change-Id: I1fc81f96dbc8421e0338f5a02fd70b785c04d924