Merge "Enlarge the onAvailable callback timeout to 30 seconds" am: fbf126a6f8 am: 5bf0181b36

Original change: https://android-review.googlesource.com/c/platform/cts/+/1324092

Change-Id: Id3e19e53bf62579f70dad1163fd90a3455025115
tree: 795405d2cd522303d5c47bfd61f04dc25e857ed7
  1. tests/