Merge "Don't relaunch activity in TaskRecord.size if caller deferResume" into oc-dev
am: 25cedc232d

Change-Id: I66994bfd9c39c60f78f2afda6953bef162c74d6f