[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 4006c9667a -s ours

am skip reason: Merged-In Ia4ea48d86148e43971881e9232475567cd93d585 with SHA-1 8c03783a45 is already in history

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

Change-Id: Ia60d9e2d7c77a5a7a575a9469b56e60b19e70783