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

Merge "Fix "always" option in ResolverActivity" into tm-dev am: 926db2d6 am: b4ac4d38 am: 991770e0 am: 10892b03

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



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