Merge cherrypicks of ['googleplex-android-review.googlesource.com/25061619', 'googleplex-android-review.googlesource.com/25545533', 'googleplex-android-review.googlesource.com/25575421'] into security-aosp-sc-release.

Change-Id: I969ea3fd4ea5b16b096467bdff6d767f48be2ecb