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: f049d218 am: 881eeb89 am: 31b056a9

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

Change-Id: If86cef65b39981137a0e3d852db95e005d478f63