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: 33c669f4 am: b8f4e685

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

Change-Id: I5a61a0df8a55303133c836b6128d78c9deb4d2a4