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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/20322502', 'googleplex-android-review.googlesource.com/22915959', 'googleplex-android-review.googlesource.com/22599577', 'googleplex-android-review.googlesource.com/23083140', 'googleplex-android-review.googlesource.com/23090199', 'googleplex-android-review.googlesource.com/23033896', 'googleplex-android-review.googlesource.com/23331796', 'googleplex-android-review.googlesource.com/23410117', 'googleplex-android-review.googlesource.com/23210299', 'googleplex-android-review.googlesource.com/23352460', 'googleplex-android-review.googlesource.com/23207574', 'googleplex-android-review.googlesource.com/23429137', 'googleplex-android-review.googlesource.com/23386456', 'googleplex-android-review.googlesource.com/23430378', 'googleplex-android-review.googlesource.com/23465066', 'googleplex-android-review.googlesource.com/23475286', 'googleplex-android-review.googlesource.com/23439343'] into security-aosp-sc-v2-release.

Change-Id: I10c5d0b596caacf9b0ac802f11aceff6f0c5a3c9