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

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

Change-Id: I64d2b91232a18e753a30c107859e4e061df75ff0