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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/30595974', 'googleplex-android-review.googlesource.com/30595926', 'googleplex-android-review.googlesource.com/31155598', 'googleplex-android-review.googlesource.com/31106213', 'googleplex-android-review.googlesource.com/31095395'] into security-aosp-sc-v2-release.

Change-Id: I3189605c4e06669e4b7b9d3a0345642fef7f5bd8