Android security 14.0.0 release 2
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24271775', 'googleplex-android-review.googlesource.com/24271776'] into udc-release.

Change-Id: I798cbd73e4976768c2f72fc11111c9d5c5231714