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

Change-Id: Ie916e383a44aadf09484cfad3f2a0edac9951c6d