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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/20294144', 'googleplex-android-review.googlesource.com/20219552', 'googleplex-android-review.googlesource.com/20946190', 'googleplex-android-review.googlesource.com/20460002', 'googleplex-android-review.googlesource.com/22390145', 'googleplex-android-review.googlesource.com/22455204', 'googleplex-android-review.googlesource.com/22633545', 'googleplex-android-review.googlesource.com/22599772', 'googleplex-android-review.googlesource.com/21327525', 'googleplex-android-review.googlesource.com/22621733', 'googleplex-android-review.googlesource.com/22931456', 'googleplex-android-review.googlesource.com/22908601', 'googleplex-android-review.googlesource.com/22926536', 'googleplex-android-review.googlesource.com/22908033'] into security-aosp-rvc-release.

Change-Id: If496f6a4bf2e7d62c027cf71da62bc7f6358c423