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

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

Change-Id: I5cbc6b499b6c8dc41cb4a63a5a28f25f1909d15f