Merge cherrypicks of ['googleplex-android-review.googlesource.com/24366176'] into security-aosp-udc-release. Change-Id: I6c8405bad879bc2d9d0613580dfef29bbb96047a