[automerger skipped] Add retry in setProp test. am: 62fe882688 am: 4381d2445c am: fca25aed95 am: 0c68c03d21 -s ours am: 52ebf31685 -s ours

am skip reason: Merged-In If9349a097a92c51101c7b5f4bf807b610ab2cb0b with SHA-1 62fe882688 is already in history

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

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