[automerger skipped] Add retry in setProp test. am: 62fe882688 -s ours am: 2b31910a47 -s ours am: 72bd049404 -s ours

am skip reason: Merged-In If9349a097a92c51101c7b5f4bf807b610ab2cb0b with SHA-1 1837df06c2 is already in history

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

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