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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/22900658', 'googleplex-android-review.googlesource.com/23152794', 'googleplex-android-review.googlesource.com/23152778', 'googleplex-android-review.googlesource.com/22726306', 'googleplex-android-review.googlesource.com/21609715', 'googleplex-android-review.googlesource.com/22581496'] into security-aosp-tm-release.

Change-Id: I610a7d565e9284baf580078251e4c346d22caa76