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

Change-Id: I1efaa06671119e2cadc2eb3d7ba5453a0beea070