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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/25603480', 'googleplex-android-review.googlesource.com/26238492', 'googleplex-android-review.googlesource.com/26485132', 'googleplex-android-review.googlesource.com/26307234', 'googleplex-android-review.googlesource.com/26151073', 'googleplex-android-review.googlesource.com/26720245', 'googleplex-android-review.googlesource.com/26685061', 'googleplex-android-review.googlesource.com/26677508', 'googleplex-android-review.googlesource.com/26183005', 'googleplex-android-review.googlesource.com/25839619', 'googleplex-android-review.googlesource.com/26554109', 'googleplex-android-review.googlesource.com/26721087', 'googleplex-android-review.googlesource.com/26738221', 'googleplex-android-review.googlesource.com/26703706'] into security-aosp-udc-release.

Change-Id: I123fd62f3bd00069b99e33813cb75ccb4aec22c0