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

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

Change-Id: Id355bc9a72696904b0ea2739e12f4ff4af1a2370