[automerger skipped] Merge changes I700b04d3,If56e449a am: 0179b6a940 am: e545d1f809 -s ours

am skip reason: Merged-In I700b04d3060e9405b1445206882a6131cea0d045 with SHA-1 43966208b7 is already in history

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

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