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

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



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