Merge "Revert "Restore preferred activity filter if it not inside"" am: e6439f8866

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

Change-Id: I1289e70475b5ac9d72c770cfbe9c63e2b5f5cb5c