[automerger skipped] Follow-up commit of aosp/2329897 am: 5babeec8a6 -s ours

am skip reason: Merged-In Ied83dac5c33e06f6ad4ced18fbee785047b24c38 with SHA-1 562cbfeea2 is already in history

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

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