Merge "Fix "always" option in ResolverActivity" into tm-dev am: 926db2d6 am:...

Merge "Fix "always" option in ResolverActivity" into tm-dev am: 926db2d6 am: 97ac38de am: 09644a6e am: 927605a4

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



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