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

Bug: 214455710
Merged-In: I78845f2ff01e523e988cb2682d04c732871d7288
Change-Id: I6b5fb32cb61b9a4c380b263a675dd6d03cbec1bc