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

Bug: 226662282
Merged-In: I87467605520d5dd168c3b03ac3b699800bd96030
Change-Id: I12365876665df7bc4405835f4abf5a35884415a3