Merge cherrypicks of ['googleplex-android-review.googlesource.com/35166508', 'googleplex-android-review.googlesource.com/35805838', 'googleplex-android-review.googlesource.com/36009173'] into security-aosp-udc-release. Change-Id: I99e67901fab5cb213a36e1ce13b15f91976bfe1d