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

Change-Id: I718fd5dfff56a1b0d6188257f388486382b59853