[automerger skipped] Mark ab/8191998 as merged am: c54f173c90 -s ours am: 0ad07ac76f -s ours am: 9b8e671b9b -s ours am: 05bcd21997 -s ours

am skip reason: Merged-In I059c18464cd78ab9af9f4b3822780e3585318716 with SHA-1 0857973e9c is already in history

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

Change-Id: I4bb71374899ef82beddcb660896185dbe48b4a84