Android Security 13.0.0 Release 14 (11228180)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/25444046', 'googleplex-android-review.googlesource.com/25201484'] into security-aosp-tm-release.

Change-Id: I098f23a34db33ad0e5d5da8854d2c04b2d89598f