[automerger skipped] Merge "Switch test refresh timeout to full test timeout"...

[automerger skipped] Merge "Switch test refresh timeout to full test timeout" into android14-tests-dev am: d0bda92d am: 3845fa59 am: af0e77fd am: e11c0222 -s ours

am skip reason: Merged-In I1f9dc8749d46f437c8dfbb98228ed1f042ee5821 with SHA-1 634854be is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Permission/+/2798535



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