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

Change-Id: I5936507b5ddfcb6a6190b295fa1ec0b8d9f0db19