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

Change-Id: I60fecc5dbda9d4ed5a4375ee632f028a2d1ba85d