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

Merge "Merge "Fix "always" option in ResolverActivity" into tm-dev am: 926db2d6 am: 97ac38de" into tm-d1-dev-plus-aosp am: 719e7e6c

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



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