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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/23918399', 'googleplex-android-review.googlesource.com/24405959', 'googleplex-android-review.googlesource.com/23987679', 'googleplex-android-review.googlesource.com/23988011', 'googleplex-android-review.googlesource.com/24029253', 'googleplex-android-review.googlesource.com/24005105', 'googleplex-android-review.googlesource.com/24575247', 'googleplex-android-review.googlesource.com/24046929', 'googleplex-android-review.googlesource.com/24339445', 'googleplex-android-review.googlesource.com/24762427', 'googleplex-android-review.googlesource.com/23623415', 'googleplex-android-review.googlesource.com/24606761', 'googleplex-android-review.googlesource.com/24182288', 'googleplex-android-review.googlesource.com/24790879', 'googleplex-android-review.googlesource.com/24058898', 'googleplex-android-review.googlesource.com/24419913', 'googleplex-android-review.googlesource.com/24555974', 'googleplex-android-review.googlesource.com/24945646', 'googleplex-android-review.googlesource.com/24998046'] into security-aosp-udc-release.

Change-Id: Ied6ee6a70346e8ab95b3057a0067f9a18c26c8f1