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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/23476871', 'googleplex-android-review.googlesource.com/23733070', 'googleplex-android-review.googlesource.com/23474146', 'googleplex-android-review.googlesource.com/23905843', 'googleplex-android-review.googlesource.com/23905120', 'googleplex-android-review.googlesource.com/23834726'] into security-aosp-tm-release.

Change-Id: I1c7b53328eea2729a45e9a9fe000606df017518a