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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/24308837', 'googleplex-android-review.googlesource.com/24310393', 'googleplex-android-review.googlesource.com/23982977', 'googleplex-android-review.googlesource.com/24424817', 'googleplex-android-review.googlesource.com/24270326'] into security-aosp-tm-release.

Change-Id: I67f3e69797c4afcb2703ccd7be4a5dc2e83457d2