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

Change-Id: I064336063dcd9a3a4675467886fa88fe66849654