ActivityTransition: fix activity not finished on back

Fixed two corner cases that called activity is not finished
on back when there is no shared element in calling activity due
to "Do not keep activity" option re-creates calling activity.

b/17333777

Change-Id: I66567efcce39b301b0febd1ce7a5d67b9ff73c3c