tree a1e49b17a7e5de8036aacec58314846e6f9893ed
parent 634e7e319a78050711e749ee1efd84908b3cdb2e
parent a20b451cf44e13bdddb5ad8dcafa13fc8aee2cc7
author Songchun Fan <schfan@google.com> 1605640720 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1605640720 +0000

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