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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/20334962', 'googleplex-android-review.googlesource.com/23516859', 'googleplex-android-review.googlesource.com/23475534', 'googleplex-android-review.googlesource.com/23709052', 'googleplex-android-review.googlesource.com/23905843', 'googleplex-android-review.googlesource.com/23883016', 'googleplex-android-review.googlesource.com/23860830'] into security-aosp-sc-v2-release.

Change-Id: I4288f6ff7ef89487bbb4ecd947154c501f2e5047