Merge "Add Ring test timeout." am: dbde427be6

Original change: https://android-review.googlesource.com/c/platform/development/+/1664729

Change-Id: Iafc2feb5f60e2310d44b97cd870fbe93e37ab0e7