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

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

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