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

Bug: 214455710
Merged-In: I975390f8f495267ef0cd24dc8e73db859e541146
Change-Id: Ia540313ff7bb064b9de8a8655b59fed8c40a8aaa