Relaunch activity resumed if it got resumed before relaunching.
Relaunch activity resumed if it got resumed before relaunching.

This fixes following scenario:
1) first activity starts second activity and expects results; first
activity gets paused;
2) second activity finishes and returns a result;
3) first activity is still paused and receives the result from the second
activity; first activty requests a local relaunch; relaunch gets
scheduled and is marked as launching paused (because the activity is
still paused)
4) first activity resumes;
5) first activity relaunches and finishes in paused state.

The fix makes it drop the information about launching paused if it is
local when it gets resumed in step 4.

Bug: 25674611
Bug: 26116905
Change-Id: Ieeef3f0d5c311679882fdc59c13fd8a99e3d3a20

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base