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