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

Change-Id: Ie6ac9ed18fdf649ccad000679db855995d9eb490