[automerger skipped] Merge "DO NOT MERGE: Use a longer timeout for service registration" into pie-cts-dev am: 1461afcab8 -s ours am: 475faf55ea -s ours

am skip reason: subject contains skip directive

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

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