Merge cherrypicks of ['googleplex-android-review.googlesource.com/24025008', 'googleplex-android-review.googlesource.com/24298399'] into security-aosp-rvc-release.

Change-Id: Ib24bb877c8d0a52c8ad4dc221117966ced01d4b0