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

Bug: 214455710
Merged-In: I65b3cfd5b9c19b744fe71d8bd6e40d33bc9045d5
Change-Id: I26d8050270490afca7a5789cfcf75ecbd69a12e3