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