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