Merge "Merge stage-aosp-sc-ts-dev before making it an upstream" into sc-dev...

Merge "Merge stage-aosp-sc-ts-dev before making it an upstream" into sc-dev am: 92f23985 am: 3996d69a am: c32ee711 am: 49093e2f

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

Change-Id: I7ff10e899880e658e54d33703132f78d1c223a6c