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

Bug: 226662282
Merged-In: I82ad727d6af6413c2d1aa22a02416b9f38306fb5
Change-Id: Id3b49efe17f4ae2b1a453ddc8c2fc35ffbfd8c47