Merge "Fix return value for IActivityTaskManager#finishActivity()"