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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/28885735', 'googleplex-android-review.googlesource.com/29115762', 'googleplex-android-review.googlesource.com/29595548', 'googleplex-android-review.googlesource.com/29709104', 'googleplex-android-review.googlesource.com/29816707', 'googleplex-android-review.googlesource.com/30020377'] into security-aosp-udc-release.

Change-Id: Ia6ae4ef88e850ee7c0b36433ead6c4cf08c4f297