Merge "Merge "Fix unintended preferred activity reset" into rvc-dev am:...

Merge "Merge "Fix unintended preferred activity reset" into rvc-dev am: 69b18e57 am: a0811325 am: ca45c2bf" into rvc-qpr-dev-plus-aosp am: c048341e

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

Change-Id: Ia2d84236a2a0f14a8881427919366a5a3a192976