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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/20235229', 'googleplex-android-review.googlesource.com/20308700', 'googleplex-android-review.googlesource.com/20844717', 'googleplex-android-review.googlesource.com/20642499', 'googleplex-android-review.googlesource.com/20912010', 'googleplex-android-review.googlesource.com/20900483', 'googleplex-android-review.googlesource.com/20833418', 'googleplex-android-review.googlesource.com/20925063', 'googleplex-android-review.googlesource.com/21095804', 'googleplex-android-review.googlesource.com/21008154'] into security-aosp-rvc-release.

Change-Id: I0e26cd1e551ad2d7b426edc723b36089a3374224