Merge cherrypicks of ['googleplex-android-review.googlesource.com/32072168', 'googleplex-android-review.googlesource.com/32959762', 'googleplex-android-review.googlesource.com/32744338', 'googleplex-android-review.googlesource.com/32876450', 'googleplex-android-review.googlesource.com/33454885', 'googleplex-android-review.googlesource.com/33630209', 'googleplex-android-review.googlesource.com/33606445', 'googleplex-android-review.googlesource.com/33921517', 'googleplex-android-review.googlesource.com/33558752', 'googleplex-android-review.googlesource.com/33721253', 'googleplex-android-review.googlesource.com/33985230', 'googleplex-android-review.googlesource.com/33667613', 'googleplex-android-review.googlesource.com/34126482', 'googleplex-android-review.googlesource.com/34111321', 'googleplex-android-review.googlesource.com/33692127', 'googleplex-android-review.googlesource.com/34038510', 'googleplex-android-review.googlesource.com/34291173', 'googleplex-android-review.googlesource.com/34259779', 'googleplex-android-review.googlesource.com/34107880', 'googleplex-android-review.googlesource.com/34107881', 'googleplex-android-review.googlesource.com/34108611', 'googleplex-android-review.googlesource.com/34128037', 'googleplex-android-review.googlesource.com/34125578', 'googleplex-android-review.googlesource.com/33915508', 'googleplex-android-review.googlesource.com/33918370', 'googleplex-android-review.googlesource.com/34378319', 'googleplex-android-review.googlesource.com/34259776'] into security-aosp-tm-release.
Change-Id: I4290866e2cde231228a9fdac6cb5815bb2041ff6
