[automerger skipped] Merge "Add retry in setProp test." into...

[automerger skipped] Merge "Add retry in setProp test." into android14-tests-dev am: 2c12f0e9 am: 83a9e12f am: 9fbf4066 -s ours

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

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



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