Merge cherrypicks of ['googleplex-android-review.googlesource.com/27546891',...

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

Change-Id: I56fcb5e105adfcd25c9c39db95b443ecb573d7c4