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

Bug: 214455710
Merged-In: Id9937724a397d74c070a0b176c5ec0c18b71c9d1
Change-Id: I449466c496fca1fefe77d8669f36fce573c37bde