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

Bug: 226662282
Merged-In: Ib919d40c96d3c26d29d8c1b4af67300c4130ec42
Change-Id: I2e27d93c2d7bc1085c855456b5db91e6eff27820