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

Change-Id: Ic260879e80917dfad879c73a2d6ae0debce29f5f