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

Bug: 214455710
Merged-In: Ie3d45ef7783bb656f988a5015ad943035ec929e6
Change-Id: Id6791fa8b08b2f2bb20241ffee923197344d48d4