[automerger skipped] Merge "Add seat height properties to the emulator for CTS...

[automerger skipped] Merge "Add seat height properties to the emulator for CTS tests" into tm-qpr-dev am: c9d82cd7 am: 57d21d4d -s ours

am skip reason: Merged-In I48cd904dec83878570736cb8e99f0e169be753d7 with SHA-1 fb97396b is already in history

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



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