[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-96e5992b2dd4470eae48f4ad98b53c99" into stage-aosp-master am: 7e43375d -s ours am: ffd14f31 -s ours

am skip reason: Merged-In I3ad2e2000fb0db6a62835e621bc81d77308db140 with SHA-1 e08d1410 is already in history

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



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