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

Bug: 214455710
Merged-In: Ib1a08155c033fe93dcb2d3af430dadf3a732b7da
Change-Id: I7492a7ad83058fcf9028a9ac18b2424e7cf10b4d