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

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

Change-Id: I257d0b7e254040dfbce6b6387c4848f6421a6cd6