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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/27546891', 'googleplex-android-review.googlesource.com/27546875', 'googleplex-android-review.googlesource.com/27675441', 'googleplex-android-review.googlesource.com/26737747'] into security-aosp-sc-v2-release.

Change-Id: I1441867be0266f4d7b6fea6ac3755485f5cb14a9