Merge cherrypicks of ['googleplex-android-review.googlesource.com/21548669', 'googleplex-android-review.googlesource.com/21548670', 'googleplex-android-review.googlesource.com/21548671'] into security-aosp-sc-release.

Change-Id: I601a81a4d3c926010628fce0b1532264d5d4fbeb