Merge "Revert "Revert "Restore preferred activity filter if it not inside""" am: 406e3a063d am: b3bd1acb09

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

Change-Id: I085cf33e85d61915886cf86a46f0a92d38c54966