Merge "Increase timeout for fuzz_service_test" into main am: 858061e99f am: 284ae34e7d am: 9508f882ea am: b986ca1661

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2746404

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