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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/21564420', 'googleplex-android-review.googlesource.com/21535256', 'googleplex-android-review.googlesource.com/21609150', 'googleplex-android-review.googlesource.com/22101922', 'googleplex-android-review.googlesource.com/21614639', 'googleplex-android-review.googlesource.com/20026095', 'googleplex-android-review.googlesource.com/22290985', 'googleplex-android-review.googlesource.com/22301867', 'googleplex-android-review.googlesource.com/22312942'] into security-aosp-rvc-release.

Change-Id: I6add43f5842300a918f1e728d175b186d2286135