Android security 13.0.0 release 7
Merge cherrypicks of ['googleplex-android-review.googlesource.com/22262687'] into security-aosp-tm-release.

Change-Id: I93388caa3b61fe89c2e26f3999874e7ed3564557