tree dd07fce163c98282125145398dd41fc49711105e
parent ee01197b77c0a7e28a2851000b37fbdf76573389
parent 248bfa3d92c8960714df3afb9dbd49e99ed8f0a3
author Wale Ogunwale <ogunwale@google.com> 1605741471 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1605741471 +0000

Merge "Revert "Restore preferred activity filter if it not inside"" am: e6439f8866 am: 248bfa3d92

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

Change-Id: Idf0313c12075cae8020f60a01b150875765ccc11