Merge cherrypicks of ['googleplex-android-review.googlesource.com/21872485', 'googleplex-android-review.googlesource.com/22290643'] into security-aosp-tm-release.

Change-Id: I0d64f190ca1a197241d6c9ba67e7ea7582f79ab6