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

Change-Id: If57611a112bbc168a3906b8378b6137a0fffdc7a