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