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

Change-Id: Ib2b74f498bb26af29ab740ef1df8903a129d93ba