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

Bug: 226662282
Merged-In: I6541f7d49cb932c85374bf9acf777038b888e873
Change-Id: I95df36a778a7fa9ea52fe0bba2332534d6288032