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