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

Bug: 214455710
Merged-In: I74c20512b392f8eef0dbf98c085d812a8a4d6c57
Change-Id: Icc3624f3ffef3ca8f9168473ca92f628e17e65c5