Merge "Use longer timeout for reportShown call" into sc-qpr1-dev am: 6ef0aae53b am: 78bd25397a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15834211

Change-Id: I10d646706d81a713afaeafb9a4b0d89e9f3fd868