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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/22900658', 'googleplex-android-review.googlesource.com/24131190', 'googleplex-android-review.googlesource.com/31317704', 'googleplex-android-review.googlesource.com/29817521', 'googleplex-android-review.googlesource.com/31743928'] into security-aosp-tm-release.

Change-Id: Ic8de2ea7e98a7c05c1ca2e95b6f57a782db555cc