[automerger skipped] Merge "Adding owners" am: 00c56f8f36 am: ed471bd445 am: 5b5494b3e4 -s ours am: 8aaa3dc61e -s ours

am skip reason: Merged-In I586787a31cab0d32d14d43f5f84ceb1e14087aa4 with SHA-1 8200cff2e4 is already in history

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

Change-Id: I45244af56c84b42077abd544c45dd0b819b788b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>