Merge "Merge "Remove testFinishActivityWithMoveTaskToBackAfterStop from CTS." into oreo-cts-dev am: e6ce93935a" into oreo-mr1-cts-dev