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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/20309299', 'googleplex-android-review.googlesource.com/22911665', 'googleplex-android-review.googlesource.com/23133236', 'googleplex-android-review.googlesource.com/23089588', 'googleplex-android-review.googlesource.com/23028641', 'googleplex-android-review.googlesource.com/23210299', 'googleplex-android-review.googlesource.com/23410116', 'googleplex-android-review.googlesource.com/23174295', 'googleplex-android-review.googlesource.com/23475765', 'googleplex-android-review.googlesource.com/23438530'] into security-aosp-rvc-release.

Change-Id: I80e4a02eb3547577691522b684df14cf179e8504