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

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

Change-Id: Ifced108a9d1621597197db8285e75eb5a826f2bf