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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/25101932', 'googleplex-android-review.googlesource.com/25064728', 'googleplex-android-review.googlesource.com/25329531', 'googleplex-android-review.googlesource.com/23183708', 'googleplex-android-review.googlesource.com/24709429', 'googleplex-android-review.googlesource.com/25387217', 'googleplex-android-review.googlesource.com/25262177', 'googleplex-android-review.googlesource.com/25262178'] into security-aosp-sc-v2-release.

Change-Id: I90bd08920459075e169e5eb30839877a85ba8a82