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

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

Change-Id: Idf0313c12075cae8020f60a01b150875765ccc11