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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/21537728', 'googleplex-android-review.googlesource.com/21564420', 'googleplex-android-review.googlesource.com/21611506', 'googleplex-android-review.googlesource.com/22071923', 'googleplex-android-review.googlesource.com/21614378', 'googleplex-android-review.googlesource.com/19285838', 'googleplex-android-review.googlesource.com/19285839', 'googleplex-android-review.googlesource.com/22088256', 'googleplex-android-review.googlesource.com/22290962', 'googleplex-android-review.googlesource.com/20026089', 'googleplex-android-review.googlesource.com/22137702', 'googleplex-android-review.googlesource.com/22299207', 'googleplex-android-review.googlesource.com/22204857', 'googleplex-android-review.googlesource.com/22409910'] into security-aosp-tm-release.

Change-Id: Ifa9a992e5e2854c4a6be390458f4e1b361eed5f5