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

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

Change-Id: Ia14b9965db1ab345edcb8ce54e3ef60176908b1e