[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into stage-aosp-master am: 50983824 -s ours am: 744fd703 -s ours

am skip reason: Merged-In I4fe9ddd1c22ebfff03f5660ec9b01de2521f8533 with SHA-1 3ee79d5a is already in history

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



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