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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26699237', 'googleplex-android-review.googlesource.com/26941037', 'googleplex-android-review.googlesource.com/27001589', 'googleplex-android-review.googlesource.com/26551914', 'googleplex-android-review.googlesource.com/27073589'] into security-aosp-sc-v2-release.

Change-Id: If23280b9ec3cbbd94f9f95ee2e88d61d10016c93