[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L72900000960740480:N72500001370112762" into udc-qpr-dev am: ee2d481c -s ours am: c9887839 -s ours

am skip reason: Merged-In Icf578b8d28647e6355ed5328599c77d2ca1234f9 with SHA-1 aa8f76af is already in history

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



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