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

Change-Id: I7bcff909452357e7d200c7ddbe6e7075489a63f4