Merge cherrypicks of ['googleplex-android-review.googlesource.com/20290592', 'googleplex-android-review.googlesource.com/22633470', 'googleplex-android-review.googlesource.com/22625071', 'googleplex-android-review.googlesource.com/22438867', 'googleplex-android-review.googlesource.com/22772854'] into security-aosp-tm-release.

Change-Id: Ia334d7b5d94f170b18ed2922d85dfe8d8ce8b65d