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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/25492676', 'googleplex-android-review.googlesource.com/25494184', 'googleplex-android-review.googlesource.com/25558746', 'googleplex-android-review.googlesource.com/25676552', 'googleplex-android-review.googlesource.com/25842635'] into security-aosp-tm-release.

Change-Id: I7409e0dc04e6facec237e0b5c81a61b934a274f3