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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/25102047', 'googleplex-android-review.googlesource.com/25043220', 'googleplex-android-review.googlesource.com/25379523', 'googleplex-android-review.googlesource.com/25116113', 'googleplex-android-review.googlesource.com/25381953', 'googleplex-android-review.googlesource.com/25410669', 'googleplex-android-review.googlesource.com/24709104', 'googleplex-android-review.googlesource.com/25188138', 'googleplex-android-review.googlesource.com/25188139'] into security-aosp-udc-release.

Change-Id: I3033da956d2bc85949434d103f800308a3014cdf