Merge "Merge "Merge stage-aosp-sc-ts-dev before making it an upstream" into sc-dev am: 92f2398542" into sc-dev-plus-aosp am: 28c22c0f12 am: 0b3ea2d000

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15560119

Change-Id: Ia95a49afe7cd14355da895bdddf794be9dfe229e