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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/20219552', 'googleplex-android-review.googlesource.com/20946190', 'googleplex-android-review.googlesource.com/20460002', 'googleplex-android-review.googlesource.com/22390145', 'googleplex-android-review.googlesource.com/22616881', 'googleplex-android-review.googlesource.com/21327525', 'googleplex-android-review.googlesource.com/22621774', 'googleplex-android-review.googlesource.com/22787457', 'googleplex-android-review.googlesource.com/22907463', 'googleplex-android-review.googlesource.com/22895638'] into security-aosp-sc-v2-release.

Change-Id: I7fc9017ccc7720ffe432490464885a9c9b9aaf5a