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: 58fc79fc

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

Change-Id: I3c5729d6c791f0db89fb17001daab82b9d2a3555