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

Bug: 214455710
Merged-In: I2e417522c104ffaa83f63c4fd5a5abe8a47b174e
Change-Id: I858d7e392a594ada1b5519b911e73cc5bceeb79b