Merge cherrypicks of ['googleplex-android-review.googlesource.com/26518905'] into security-aosp-tm-release. Change-Id: I000aebfba368e2025c786d724cd79078ef151d1d