Merge "Add retry in setProp test." into android14-tests-dev am: 2c12f0e9ae am: 03522b39c9

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

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