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

Change-Id: I2dfda2b18e4465eda94e3df0369b549011758f85