Merge "Adding owners" am: 00c56f8f36 am: ed471bd445

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

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