Merge sc-v2-dev-plus-aosp-without-vendor@8433047

Bug: 226662282
Merged-In: I0c52dad86c0e8d7442e659b2fad7a95ac610f774
Change-Id: Id40b005d96fe4b13e171cfd8f8123791bda48c27