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

Change-Id: I500767631c7aa14d9e5ecfd0af39c5209eb72382