Merge cherrypicks of ['googleplex-android-review.googlesource.com/24679067', 'googleplex-android-review.googlesource.com/23452302', 'googleplex-android-review.googlesource.com/24395496', 'googleplex-android-review.googlesource.com/24944816'] into security-aosp-tm-release.

Change-Id: I285a7add1fc8d66bcd4fcb3799e8000750df53b5