[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: c1b8fb3480 -s ours am: b0943e90a4 -s ours

am skip reason: Merged-In Ica9462cae72ed201bcada1c342a6ad0bc422f64b with SHA-1 306c7d994f is already in history

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

Change-Id: I5067d58254d361312dba6705c62aff40fe6c9607