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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/18029146', 'googleplex-android-review.googlesource.com/21162033', 'googleplex-android-review.googlesource.com/21267341', 'googleplex-android-review.googlesource.com/21238189', 'googleplex-android-review.googlesource.com/17695640', 'googleplex-android-review.googlesource.com/21119495', 'googleplex-android-review.googlesource.com/21656348', 'googleplex-android-review.googlesource.com/21611410', 'googleplex-android-review.googlesource.com/21740100', 'googleplex-android-review.googlesource.com/21535256', 'googleplex-android-review.googlesource.com/21564438', 'googleplex-android-review.googlesource.com/21781625'] into security-aosp-rvc-release.

Change-Id: I671ffdfa363cf0dd32ce44ce7f3e3b11adc0b965