[automerger skipped] Merge "Add placeholder properties for emulator" into...

[automerger skipped] Merge "Add placeholder properties for emulator" into sc-v2-dev am: c490c135 am: 6439b425 -s ours

am skip reason: Merged-In I6131a4892495c4c1e1c73e078572a666a33f984e with SHA-1 4d1fe81b is already in history

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

Change-Id: Id5901cd838092f7c84f29b4ab880aad6c14d618a