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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/31299538', 'googleplex-android-review.googlesource.com/32334796', 'googleplex-android-review.googlesource.com/32628924', 'googleplex-android-review.googlesource.com/32773608', 'googleplex-android-review.googlesource.com/32222159', 'googleplex-android-review.googlesource.com/32480306', 'googleplex-android-review.googlesource.com/32648967'] into security-aosp-tm-release.

Change-Id: I9e8652f65ad6b9cd6f8ef3a09d395e9b7339bc80