Android Security 14.0.0 Release 5 (11228181)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/25444203', 'googleplex-android-review.googlesource.com/25187678'] into security-aosp-udc-release.

Change-Id: I4b5900e9d40f12b75d4146cea474a920ae525c40