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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/20322502', 'googleplex-android-review.googlesource.com/25124582', 'googleplex-android-review.googlesource.com/26225135', 'googleplex-android-review.googlesource.com/25522017', 'googleplex-android-review.googlesource.com/26460033', 'googleplex-android-review.googlesource.com/26151073', 'googleplex-android-review.googlesource.com/26297402', 'googleplex-android-review.googlesource.com/23400867', 'googleplex-android-review.googlesource.com/26720245', 'googleplex-android-review.googlesource.com/26802222', 'googleplex-android-review.googlesource.com/26766897', 'googleplex-android-review.googlesource.com/26721087', 'googleplex-android-review.googlesource.com/26693133', 'googleplex-android-review.googlesource.com/26802630', 'googleplex-android-review.googlesource.com/26709091'] into security-aosp-sc-v2-release.

Change-Id: Ida420de29481038ddb2f421cfa0fd8c1646ae25c