Merge "Make TileQueryHelperTest less flaky" into rvc-dev am: c59312aaec am: a2d09a565a

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

Change-Id: Ia663fc4c5f3f022966394e44ec1308e435362250