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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/25713742', 'googleplex-android-review.googlesource.com/25830295', 'googleplex-android-review.googlesource.com/25948484', 'googleplex-android-review.googlesource.com/25891466'] into security-aosp-sc-v2-release.

Change-Id: I71107ab5d8c5cc8d8b9a37136a99fd0d03177d5c