Merge "Fix unintended preferred activity reset" into rvc-dev am: 69b18e57fc am: b09e002838 am: 5d1c271b1c

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

Change-Id: I4ab7bd24f99c89bbb086c1ee51b9833fc15571bd