Merge cherrypicks of ['googleplex-android-review.googlesource.com/39871671', 'googleplex-android-review.googlesource.com/40244440', 'googleplex-android-review.googlesource.com/40244441', 'googleplex-android-review.googlesource.com/40244442'] into security-aosp-udc-release.

Change-Id: I4fa4a616b4a4678428c0f9fa2aa0eafec8a429d9