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

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

Change-Id: I42e1dac0da3fd3d895406208b202b88779f2b01f