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

Change-Id: Id9617493e2636d1bff43ef57611423f4e72f56d0