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

Change-Id: I9c4eca17503b39de89bb2a4fd068f7d7da80d95f