Restore preferred activity filter if it not inside

If the current preferred activity has been restored, it will not be added  when restoring preferred activity

Bug: 170589675
Change-Id: Ie5aab1c738343c3a61bb2ae8bd62e1afb9fb5d47
(cherry picked from commit da90fd98)