Merge "Fix unintended preferred activity reset" into rvc-dev am: 69b18e57fc am: a08113255b

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

Change-Id: Ie6e90cdc7ec8cd2788bf3501b869cbe7d3e026c8