tree 4fc2d8d836b157c1143406d78cc65a7d532d1ca8
parent a957ca5bfd12daa51fedd99b46b8c6edffcbf702
parent 37f00df53d3118ee0af00610bafd248bf5c1c9ad
author Songchun Fan <schfan@google.com> 1594853441 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594853441 +0000

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: Id6d88306e545bb1f9327ad937eb12443101652e8