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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/21564420', 'googleplex-android-review.googlesource.com/21537729', 'googleplex-android-review.googlesource.com/21674619', 'googleplex-android-review.googlesource.com/22100003', 'googleplex-android-review.googlesource.com/21614465', 'googleplex-android-review.googlesource.com/22141712', 'googleplex-android-review.googlesource.com/22290982', 'googleplex-android-review.googlesource.com/20026090', 'googleplex-android-review.googlesource.com/22311042', 'googleplex-android-review.googlesource.com/22312922'] into security-aosp-sc-v2-release.

Change-Id: I662aa509872d9d1132ad9737936d7665c48be041