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

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

Change-Id: Id6d88306e545bb1f9327ad937eb12443101652e8