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

Bug: 214455710
Merged-In: I763f2164b320f45e5cafd84e971718079fb2b384
Change-Id: I047833628888634e24ac2738a459ad00aea75754