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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/23912846', 'googleplex-android-review.googlesource.com/25101850', 'googleplex-android-review.googlesource.com/25045512', 'googleplex-android-review.googlesource.com/23265596', 'googleplex-android-review.googlesource.com/24708466', 'googleplex-android-review.googlesource.com/25387217', 'googleplex-android-review.googlesource.com/25240034', 'googleplex-android-review.googlesource.com/25240035', 'googleplex-android-review.googlesource.com/25262286'] into security-aosp-tm-release.

Change-Id: I944103f7399dd216f6acac4139f4d6559ba19c51