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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/20251403', 'googleplex-android-review.googlesource.com/20828778', 'googleplex-android-review.googlesource.com/20641928', 'googleplex-android-review.googlesource.com/20709903', 'googleplex-android-review.googlesource.com/20898477', 'googleplex-android-review.googlesource.com/20924743', 'googleplex-android-review.googlesource.com/20322501', 'googleplex-android-review.googlesource.com/20953243', 'googleplex-android-review.googlesource.com/21080663', 'googleplex-android-review.googlesource.com/21129647', 'googleplex-android-review.googlesource.com/21005178'] into security-aosp-tm-release.

Change-Id: Ib3858bd1496148308083cf847c58da0f54aad3a5