Merge cherrypicks of ['googleplex-android-review.googlesource.com/24081613', 'googleplex-android-review.googlesource.com/25101932', 'googleplex-android-review.googlesource.com/25064728', 'googleplex-android-review.googlesource.com/23183708', 'googleplex-android-review.googlesource.com/24696686', 'googleplex-android-review.googlesource.com/25387217', 'googleplex-android-review.googlesource.com/25286113', 'googleplex-android-review.googlesource.com/25286114'] into security-aosp-sc-release.
Change-Id: If74ba75cabd36b11f5aa9b5623655ef08be7bbb8
