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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/27145545', 'googleplex-android-review.googlesource.com/27266232', 'googleplex-android-review.googlesource.com/27316786', 'googleplex-android-review.googlesource.com/27431144', 'googleplex-android-review.googlesource.com/27146225', 'googleplex-android-review.googlesource.com/27263999', 'googleplex-android-review.googlesource.com/27214657'] into security-aosp-udc-release.

Change-Id: I3313472c5c6f59d9a26397915d3cfb9d95db1aed