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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/33193054', 'googleplex-android-review.googlesource.com/33199375', 'googleplex-android-review.googlesource.com/33186158', 'googleplex-android-review.googlesource.com/33876332', 'googleplex-android-review.googlesource.com/33751643', 'googleplex-android-review.googlesource.com/33922892', 'googleplex-android-review.googlesource.com/34044566'] into security-aosp-tm-release.

Change-Id: I901a1ca5a392d57c16d4e098120f62fb7beb6046