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

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

Change-Id: I4641334342290bd097ea6bccf3f248ede2c6e9b0