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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/27155205', 'googleplex-android-review.googlesource.com/27266232', 'googleplex-android-review.googlesource.com/27318647', 'googleplex-android-review.googlesource.com/27198359', 'googleplex-android-review.googlesource.com/27416928', 'googleplex-android-review.googlesource.com/27158350', 'googleplex-android-review.googlesource.com/27212503'] into security-aosp-tm-release.

Change-Id: Ic1ef5f29546165c16cb9acefebf006970dad8fbc