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

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



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