Merge cherrypicks of ['googleplex-android-review.googlesource.com/29050912', 'googleplex-android-review.googlesource.com/29050913', 'googleplex-android-review.googlesource.com/29050914', 'googleplex-android-review.googlesource.com/29050915', 'googleplex-android-review.googlesource.com/29050916', 'googleplex-android-review.googlesource.com/29050917'] into security-aosp-udc-release.

Change-Id: I14af9d54a044cf7b7386a4cf368bbd7c2d79efc0