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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/21159679', 'googleplex-android-review.googlesource.com/21266935', 'googleplex-android-review.googlesource.com/21238189', 'googleplex-android-review.googlesource.com/21397560', 'googleplex-android-review.googlesource.com/21649216', 'googleplex-android-review.googlesource.com/21687822', 'googleplex-android-review.googlesource.com/21537728', 'googleplex-android-review.googlesource.com/20884575', 'googleplex-android-review.googlesource.com/21566820'] into security-aosp-tm-release.

Change-Id: I451d2a2c7e88188daa78c52a9c1a040a66b563f7