Merge "Merge "Merge stage-aosp-sc-ts-dev before making it an upstream" into...

Merge "Merge "Merge stage-aosp-sc-ts-dev before making it an upstream" into sc-dev am: 92f23985" into sc-dev-plus-aosp am: 28c22c0f am: 0b3ea2d0 am: 4aa70d94

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

Change-Id: If21e76d1a32b6c1ec224ccaf2f3f603cbded743b