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

Bug: 214455710
Merged-In: I6916462c36f34332fc14c140be619d946c22d1f5
Change-Id: I9243165b769009363e1510ed2ca492ebdc1af5b3