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

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

Change-Id: Ie519aaa68af0354b5b34774b334c26e1d7deda72