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

Bug: 214455710
Merged-In: Ia5eb388eb5a653b089db6b569f2e0acf7174b4d3
Change-Id: I8b1787d54907dd3ef3dca2e6c9483893c4e73f7d