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

Bug: 214455710
Merged-In: Ica9462cae72ed201bcada1c342a6ad0bc422f64b
Change-Id: I3cfcf157a5d62f25033074b0429b2d347ebac215