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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/28784983', 'googleplex-android-review.googlesource.com/31043663', 'googleplex-android-review.googlesource.com/31226850', 'googleplex-android-review.googlesource.com/31172437'] into security-aosp-tm-release.

Change-Id: Id1f9b6d61fb6c330870253be7e3108f75d7d17fa