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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/27546891', 'googleplex-android-review.googlesource.com/27675440', 'googleplex-android-review.googlesource.com/26737807', 'googleplex-android-review.googlesource.com/28215785'] into security-aosp-tm-release.

Change-Id: I72549c0e3c45d7514b4a4f8087c9ba449699e29a