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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/24413225', 'googleplex-android-review.googlesource.com/24665407', 'googleplex-android-review.googlesource.com/24805656', 'googleplex-android-review.googlesource.com/24664848', 'googleplex-android-review.googlesource.com/25165839', 'googleplex-android-review.googlesource.com/25096530'] into security-aosp-udc-release.

Change-Id: I5439746628fdd1059f312ccb4bb3ac4f33ea578d