Merge "Fix NPE on ActivityStack.removeTask when launched with invalid taskId" into qt-dev
am: 1e09d0e489

Change-Id: I54d5795403387575b700381a185ea7d289215fc8