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

Change-Id: Iea1fd39178d2c5056fa9977e6f86b661375ae4ef