[automerger skipped] DO NOT MERGE: Use a longer timeout for service registration am: ccff475cce -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/cts/+/2306105

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