[automerger skipped] Merge changes I26fd4fd2,Iaadf6e9b,I7d42f8a7,I0482376e...

[automerger skipped] Merge changes I26fd4fd2,Iaadf6e9b,I7d42f8a7,I0482376e into stage-aosp-tm-ts-dev am: 744c3292 am: 5c5c78aa am: b4027e5f am: 6a38ecb0 -s ours am: 1d962573 -s ours

am skip reason: Merged-In I26fd4fd26914ed2a0b3273f4ae5512a87f9cca2c with SHA-1 3b167a63 is already in history

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



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