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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/28885734', 'googleplex-android-review.googlesource.com/29114662', 'googleplex-android-review.googlesource.com/29596585', 'googleplex-android-review.googlesource.com/29710097', 'googleplex-android-review.googlesource.com/29816706', 'googleplex-android-review.googlesource.com/30020378'] into security-aosp-tm-release.

Change-Id: Ia4408aa7e7af7b6cadc47347d3b1baaa15c80f32