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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/28501350', 'googleplex-android-review.googlesource.com/28500389', 'googleplex-android-review.googlesource.com/28503631', 'googleplex-android-review.googlesource.com/28494293'] into security-aosp-sc-v2-release.

Change-Id: Ic632d15628db29b57656828d4837ac5917c2fef2