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

Change-Id: I2488ffa746db66607f9dcf7a80661168fc99bc51