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

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

Change-Id: Ib7378cafa08abf5b0c3af78e3bffa956d2e7e21c