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

Bug: 214455710
Merged-In: If2c6a9689a61b6965ba64b6e62ea21c8b1e3dc7b
Change-Id: I793eee4a4e8c2f9aeb4163e72f970e1b7b5a73ea