Merge "Fix unintended preferred activity reset" into rvc-dev am: 69b18e57 am: b09e0028

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

Change-Id: If7eb1c36e85f0c3b3cec63c7456ee3d488e48ec3