Merge "Add Ring test timeout." am: dbde427be6 am: bfd4bdb842

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

Change-Id: I0839c539969bc623fa69bb6b8db43122f3a66558