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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26695420', 'googleplex-android-review.googlesource.com/26941037', 'googleplex-android-review.googlesource.com/27073920', 'googleplex-android-review.googlesource.com/27069625'] into security-aosp-tm-release.

Change-Id: I579447661c45e68a79ce4ba83c0c043570b56266