Merge "Fix "always" option in ResolverActivity" into tm-dev am: 926db2d6d3 am: b4ac4d3815 am: 991770e0cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17943621 Change-Id: I7a76b4a752a0f3e217ad11d5aa79b7e189233112 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: