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

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

Change-Id: I8a5d11ad2d5388d07d55be5ece4862dbadc61b55