Merge cherrypicks of ['googleplex-android-review.googlesource.com/24308899',...

Merge cherrypicks of ['googleplex-android-review.googlesource.com/24308899', 'googleplex-android-review.googlesource.com/24310240', 'googleplex-android-review.googlesource.com/23727470', 'googleplex-android-review.googlesource.com/24444452', 'googleplex-android-review.googlesource.com/24424817', 'googleplex-android-review.googlesource.com/23987679', 'googleplex-android-review.googlesource.com/23988011', 'googleplex-android-review.googlesource.com/24029253'] into security-aosp-udc-release.

Change-Id: I7e3ba1bcf27b128483fa16b6903356e44ce38572