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

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

Change-Id: Ie4ec5c89380260df60b2cfcce84edf112e65a774