[automerger skipped] Merge "Remove two timeouts in ResolverActivityTest." into tm-dev am: 2f98c9a4 am: ad08d4d6 -s ours

am skip reason: Merged-In Icf806e2babca048726fe33843df4f9f62e4bd138 with SHA-1 0f54ba75 is already in history

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



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