Merge "[pm] make sure to restore mAlways=true preferred activity filter" into...

Merge "[pm] make sure to restore mAlways=true preferred activity filter" into rvc-dev am: 37f00df5 am: f049d218 am: 2408b165

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

Change-Id: I617e50f18fe05136191233c73d412cd1d1d07b74