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

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

Change-Id: I9d2da02d0cf20648bd9dc2f9f4b9a21e657db186