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

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

Change-Id: I264c46231e6b3f44188e7e394b9bbda5c9cdb854