Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891

Bug: 214455710
Merged-In: I0e91024c49ccc9804d35b0392b8680d9a5b25648
Change-Id: Ic51af472465f76ddb1f0bfae37e290fcea7d5cb9