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

Bug: 214455710
Merged-In: I0a40e8d9a72b4e1907f0c640dcb8a08ce4a56322
Change-Id: I1b0e978b95e8981e6ac8d1dd615a189b683608d0