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

Change-Id: I0a900cea399cfe6c4e3f0bf5b96874022eaeb9b0