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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/30595972', 'googleplex-android-review.googlesource.com/30595925', 'googleplex-android-review.googlesource.com/31157025', 'googleplex-android-review.googlesource.com/31105694', 'googleplex-android-review.googlesource.com/31091508'] into security-aosp-tm-release.

Change-Id: I78bcfb64a8015501840599e1414130d53b902b08