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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/31116451', 'googleplex-android-review.googlesource.com/30699509', 'googleplex-android-review.googlesource.com/31369309', 'googleplex-android-review.googlesource.com/31592330', 'googleplex-android-review.googlesource.com/32103416', 'googleplex-android-review.googlesource.com/31789942', 'googleplex-android-review.googlesource.com/32160026', 'googleplex-android-review.googlesource.com/31247038', 'googleplex-android-review.googlesource.com/32131154'] into security-aosp-tm-release.

Change-Id: Ib79505643391cc986c6cefd27f6d5366ecc7d8f3