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

Change-Id: I1ee2d06d69239292d1c09718460c4262b19477ae