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

[automerger skipped] Merge "Merge tm-dev-plus-aosp-without-vendor@8763363" into stage-aosp-master am: da7d580d -s ours am: 9a7a594d -s ours am: 25a6f589 -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: I205de94fca1b445fd5ff4d9b22939adfe94f81bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>