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

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

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

Change-Id: I91b2b3b6a06986dc9d541c8fa3a0ae5ca6b98c86