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

Change-Id: Ic4876443825246c1dd952fb7e20ecd01ab9f9818