[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am:...

[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 30f27895 -s ours am: 4eea6495 -s ours am: 2f533b68 -s ours

am skip reason: Merged-In I2bddc0d13a4de6a5766de85fdf432fd05d84a581 with SHA-1 d3d6065f is already in history

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



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