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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/28807178', 'googleplex-android-review.googlesource.com/28757694', 'googleplex-android-review.googlesource.com/29011115'] into security-aosp-tm-release.

Change-Id: I5fe6a6113b9837e89dd71a09444d607193801e14