[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: e2f08410be -s ours am: c73be3887a -s ours

am skip reason: Merged-In I333fd284a2e0d7abf1088ac170f6d02e304615a5 with SHA-1 ddf9a67dc8 is already in history

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

Change-Id: Ic5da6b0c9bf4f68587961199fcf1018b2e929dbc