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

Change-Id: If646a82f98ad0afc03b2cc379335f1f4e95ccfc8