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

Change-Id: I20f404a1742ae21af12baeafa1e1d046146be51f