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

Bug: 226662282
Merged-In: Iffd9451788b67d3da80cefbcf8d3d0ffb7d682fd
Change-Id: Ie5c7bf77014b4b85b60c0ef373165936b4e1f566