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

Change-Id: If618ef3da0c0828c95a35fd5bfd9d760bd8b17e3