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

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

Change-Id: Ib001c8287a8b42783266d085f91d98759227eb1b