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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/24112149', 'googleplex-android-review.googlesource.com/25529244', 'googleplex-android-review.googlesource.com/25263196', 'googleplex-android-review.googlesource.com/25557600', 'googleplex-android-review.googlesource.com/25647776', 'googleplex-android-review.googlesource.com/25715830', 'googleplex-android-review.googlesource.com/25787790'] into security-aosp-udc-release.

Change-Id: I5b2d41d355a5aad36dd7cc922d5d625545690a70