Merge cherrypicks of ['googleplex-android-review.googlesource.com/31941923'] into security-aosp-udc-release.

Change-Id: Ia364c87bf0fd765b2cf8ad7686f86552ce122b74