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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/33857368', 'googleplex-android-review.googlesource.com/34289423', 'googleplex-android-review.googlesource.com/34942189', 'googleplex-android-review.googlesource.com/35131616', 'googleplex-android-review.googlesource.com/34250544', 'googleplex-android-review.googlesource.com/36030624'] into security-aosp-tm-release.

Change-Id: I6974b1daf7cb5bc34510073a0ef1b136905bf02e