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

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

Change-Id: Ifcf1309be20c4fbc750e27005ea257270e6b29d6