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

Bug: 214455710
Merged-In: I1fc134913db3c9248811a42ee1f37928f440c156
Change-Id: If072e8ebafbf3e87d4f47b02b18753f2d5e38443