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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/28596409', 'googleplex-android-review.googlesource.com/28498670', 'googleplex-android-review.googlesource.com/28712039', 'googleplex-android-review.googlesource.com/28575907', 'googleplex-android-review.googlesource.com/28705340', 'googleplex-android-review.googlesource.com/28715287', 'googleplex-android-review.googlesource.com/29072665'] into security-aosp-sc-v2-release.

Change-Id: Id029b7a5d1ed788d4bf8d02ad43c5e3892766786