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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/20322453', 'googleplex-android-review.googlesource.com/20532949', 'googleplex-android-review.googlesource.com/20860033', 'googleplex-android-review.googlesource.com/20641928', 'googleplex-android-review.googlesource.com/20912010', 'googleplex-android-review.googlesource.com/20900583', 'googleplex-android-review.googlesource.com/20924783', 'googleplex-android-review.googlesource.com/21018677', 'googleplex-android-review.googlesource.com/21096603', 'googleplex-android-review.googlesource.com/21127326', 'googleplex-android-review.googlesource.com/21017683'] into security-aosp-sc-v2-release.

Change-Id: I13172ae6ea7710323eb48b94c8a7760dc88ba8f5