[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 76ae3aae14 -s ours am: c61342fbda -s ours

am skip reason: Merged-In Ia9298b79bca6d7b25cdfc6e2718dd997d4ef84b6 with SHA-1 55e2add62b is already in history

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

Change-Id: If59ddc0580a97812d1743e003d20282cbf04c41e