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

Bug: 214455710
Merged-In: Ife565ede7fe4b86c8c854fc62d4b042b777dd226
Change-Id: I41b0f264d344daeb60050231160084c448083f16