Merge cherrypicks of ['googleplex-android-review.googlesource.com/25135945'] into security-aosp-tm-release. Change-Id: I9c94a79a390eba4be230f1091fb2859a8e1ad0af