Android security 14.0.0 release 4
Merge cherrypicks of ['googleplex-android-review.googlesource.com/25007537', 'googleplex-android-review.googlesource.com/24969251'] into security-aosp-udc-release.

Change-Id: Icd3d2db78a58be7b0a5b37858454033301c0be52