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

Bug: 214455710
Merged-In: I0fb800840ef9b3faa216b0d55946ad0bbc9fdd2b
Change-Id: I0d70389b5cdc9b4d6606414b2871474a06688d0f