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

Change-Id: Id952bc9011ef10a2cb45ad0a0045e8a52898caa8