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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/16341974', 'googleplex-android-review.googlesource.com/18054676', 'googleplex-android-review.googlesource.com/21872485', 'googleplex-android-review.googlesource.com/22290648'] into security-aosp-rvc-release.

Change-Id: Id7b0188cf1409844f55df510555f293bacac4458