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

Change-Id: I6ab8497f7937f8757e7dae914124b56970856b2a