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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/24109875', 'googleplex-android-review.googlesource.com/25667994', 'googleplex-android-review.googlesource.com/25787790', 'googleplex-android-review.googlesource.com/25718734'] into security-aosp-sc-v2-release.

Change-Id: I4fdd52ed1e43f7ff596b2fcffe1c3677f40afe65