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

Change-Id: I82e528c8a053fdef5fa0291095634de98bbe3c50