Merge "Switch test refresh timeout to full test timeout" into...

Merge "Switch test refresh timeout to full test timeout" into android14-tests-dev am: d0bda92d am: 3845fa59

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



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