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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/28503747', 'googleplex-android-review.googlesource.com/28130800', 'googleplex-android-review.googlesource.com/28575784', 'googleplex-android-review.googlesource.com/28705338', 'googleplex-android-review.googlesource.com/28718564', 'googleplex-android-review.googlesource.com/29070913'] into security-aosp-tm-release.

Change-Id: I04cede3d24f7ce16777ef4fa68f18790eb6b8820