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

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

Change-Id: I4268bc7a201e2eae6674f57ce772313cad8ef0a4