Merge cherrypicks of ['googleplex-android-review.googlesource.com/35234607'] into security-aosp-udc-release. Change-Id: I29b657376b20b1efbc00668e2a8ef9d083f3432e