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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/25705787', 'googleplex-android-review.googlesource.com/25828251', 'googleplex-android-review.googlesource.com/25949515', 'googleplex-android-review.googlesource.com/25842163', 'googleplex-android-review.googlesource.com/25891466'] into security-aosp-tm-release.

Change-Id: I81d3d1dd3b1d1d3d00f9c9b727a5af63d3c36a6d