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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/20657353', 'googleplex-android-review.googlesource.com/20606225', 'googleplex-android-review.googlesource.com/20617177', 'googleplex-android-review.googlesource.com/20617178', 'googleplex-android-review.googlesource.com/20995769'] into security-aosp-tm-release.

Change-Id: I6609dbd780337d5d54852a3fbfb176086dd75055