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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/28498671', 'googleplex-android-review.googlesource.com/28711159', 'googleplex-android-review.googlesource.com/28575785', 'googleplex-android-review.googlesource.com/28696277', 'googleplex-android-review.googlesource.com/28718561', 'googleplex-android-review.googlesource.com/29102386'] into security-aosp-udc-release.

Change-Id: Ib5181b1377a5bb4def8e4abd4312f4de6a3e3adc