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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/29999961', 'googleplex-android-review.googlesource.com/29955588', 'googleplex-android-review.googlesource.com/30025713'] into security-aosp-tm-release.

Change-Id: I2b1e4c46fa3c2116a31c277c9938bd3558a9bd3b