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

Change-Id: Id9afc735180f6e29397084fb5b0995bc965f83ed