Merge sc-v2-dev-plus-aosp-without-vendor@8084891

Bug: 214455710
Merged-In: I92f8d172e451976980c3cacc2de5597735b83e53
Change-Id: I504cece275a216e5e849969cdb4d9502ca184593