[automerger skipped] Merge "Support more types for set property cmd." into sc-v2-dev am: 0786af29fb am: 3b14735c8b -s ours

am skip reason: Merged-In Ib0e085f7a68e3d54782c21fb12caa500a0ad82ec with SHA-1 8ae3ea9813 is already in history

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

Change-Id: I6bcf5feec1dfcab06793f8076972fcd34baeadf7