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

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

Change-Id: Ice1b0018b276f5fd654ef17f17caad7f8d241765