Merge "Merge "[pm] make sure to restore mAlways=true preferred activity...

Merge "Merge "[pm] make sure to restore mAlways=true preferred activity filter" into rvc-dev am: 37f00df5 am: 33c669f4 am: b8f4e685" into rvc-qpr-dev-plus-aosp am: 3c1984d2

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

Change-Id: Ie24cb201e6274f30989c4f2ddbc6a9b3ceb37e8f