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

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

Change-Id: Ibd8117e576d3c456fd5f8688e93b12e30d7a1f7b