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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/27832090', 'googleplex-android-review.googlesource.com/28498064', 'googleplex-android-review.googlesource.com/28503632', 'googleplex-android-review.googlesource.com/28494867'] into security-aosp-tm-release.

Change-Id: I462c78993d5d7a291f9507efa796ce1c7731f4b4