Merge cherrypicks of ['googleplex-android-review.googlesource.com/22348680'] into security-aosp-sc-v2-release. Change-Id: I36fc1d6afe07c9b4d23980b3a35ad06eb9332aa5