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

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

Change-Id: Ia28a245bbcc1ff566a86d9b1030aa5a764c77803