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

Bug: 214455710
Merged-In: I70a309250eb926d9d9aa888d4aa4fd6579fdfe95
Change-Id: Idecd274de53d7e51328fd2115539dd5cb4441e1c