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

Change-Id: I4e5dd320dc068b08fb8ed05bb74dbee49ee9a174