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

Change-Id: I22fb597e773c2e08cea7260485a5fb1450924811