[automerger skipped] Merge changes I45e60f32,I2c8d3a16 am: 210c44db am:...

[automerger skipped] Merge changes I45e60f32,I2c8d3a16 am: 210c44db am: be09db54 am: 80e74102 -s ours am: 2617cd08 -s ours am: 86acd170 -s ours am: 6ae7d233 -s ours

am skip reason: Merged-In I45e60f324926588c55abd0a719fd55352767a3eb with SHA-1 4370ecf4 is already in history

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



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