Merge "Remove two timeouts in ResolverActivityTest." into tm-dev am: 2f98c9a4

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



Change-Id: I2be16c768281e65d515f49e9a974a57c324a31f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>