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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/27358794', 'googleplex-android-review.googlesource.com/27266233', 'googleplex-android-review.googlesource.com/27318644', 'googleplex-android-review.googlesource.com/27416928', 'googleplex-android-review.googlesource.com/27158824'] into security-aosp-sc-v2-release.

Change-Id: I65ec7acfecf4542995bf62daf1789d38d80c8e3a