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

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

Change-Id: I0b54e82aaf3d7ead0c2b00952801ebf29a95f69b