Merge "Increase the test timeout" into main am: 308bcbea8e

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3342095

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