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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/28807177', 'googleplex-android-review.googlesource.com/28756483', 'googleplex-android-review.googlesource.com/29010758'] into security-aosp-sc-v2-release.

Change-Id: I6732308e2cd341b9332e062a366af6a99e57e909