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

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

Change-Id: Ib594d7df0b524e1798278d068de9cb0d7c17425a