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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/25705932', 'googleplex-android-review.googlesource.com/25831313', 'googleplex-android-review.googlesource.com/25951757', 'googleplex-android-review.googlesource.com/25841331', 'googleplex-android-review.googlesource.com/25894415'] into security-aosp-udc-release.

Change-Id: I0034d26f80d90a335a43ebf79114c8f8eeba668f