Merge "Revert "Remove testFinishActivityWithMoveTaskToBackAfterStop from CTS."" into oreo-cts-dev